[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: f26dd5c1 -s ours am: 90ef95dc -s ours am: efeaa090 -s ours

am skip reason: Change-Id I539efa4d0551970e0c5c05a91e8385412e7ce9ed with SHA-1 d9b3869e is in history

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

Change-Id: Ife44897b53cb5ec70721a1531ee66498974c3a8c