Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
am: ed83139842

Change-Id: I7721cfee4ef04aa463a687b8223f881e9d153394