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

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



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