Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into...

Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 39424b2e am: 8d40e000

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24610917



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