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

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