Merge "NumberPicker a11y (and a11y-inspired) fixes" into oc-dev
am: 8d25b77e4c

Change-Id: If3d5182c2830b7a4a8e147426414ec16593ed229