[automerger skipped] Merge 10952656 am: 80d19f4133 -s ours am: 99c8c4ab8b -s ours

am skip reason: Merged-In Ifb1eee63675582d694e7783d04638d3ac0993c1c with SHA-1 5f65e508bf is already in history

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

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