Merge "Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev am: d46ae2f7ed" into nyc-mr1-dev-plus-aosp