GitLab

Cherry pick from upstream: https://codereview.chromium.org/661393005

Original description:
On Android, each object can only have a single accessible text string
associated with it - so a text field can't simultaneously have a name
and a value. Have it always return the value if nonempty, and the
name/label otherwise.

BUG=425310

BUG: 17518560
Change-Id: I464f2938782e5a3f59a183338711c3c716e1b81c