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

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



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