am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev

* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.