Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am:...
Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7 am: 1abdeafb" into nyc-mr1-dev-plus-aosp
am: ad6a7ba6
* commit 'ad6a7ba6':
Change-Id: I3f8e68f6d74782c7c63e7c553eb76d781b0ec612