[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[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: dbf6df6b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I943267f89d35798b2a743361809149a7fb14d9ad