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

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



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