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

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

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



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