Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7 am: 1abdeafb" into nyc-mr1-dev-plus-aosp