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

Change-Id: I7814872b4f530ed408587887225243a3fc1c59ce