Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into...

Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp am: 0f3739bc

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



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