Merge \"Merge \\"Add some themes to let Settings use DeviceDefault.\\" into...
Merge \"Merge \\"Add some themes to let Settings use DeviceDefault.\\" into nyc-mr1-dev am: d46ae2f7\" into nyc-mr1-dev-plus-aosp
am: 87598adb
Change-Id: I1659b77159e6ba05f2f195204a3f752ffda721e7