[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d9893cc5 am: b23d8dc5 -s ours am: a1dab607 -s ours am: 4c527243 -s ours

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

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

Change-Id: Ia61f1d98edb63896ad5120e6bca65df0d55d421c