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

Change-Id: I16896585c4b4b1f064efb29631ca8c6684d3b76e