Merge "Merge changes from topic "theme-update" into udc-dev am: eefad74d am:...

Merge "Merge changes from topic "theme-update" into udc-dev am: eefad74d am: 0c6fb1f1" into udc-d1-dev-plus-aosp am: a68cfa27 am: cf76e544

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451431



Change-Id: I467c9d24fcd24afafcd0a5dcefeb760da320f902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>