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