[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d9893cc541 am: b23d8dc514 -s ours am: a1dab60746 -s ours

am skip reason: Change-Id I30a00b2166b014e09dbbe380ac92e94d76438075 with SHA-1 90ef95dcfa is in history

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

Change-Id: I1819034226002ac9787f6cebd1db653b1fc1f342