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

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



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