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

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



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