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

am skip reason: subject contains skip directive

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

Change-Id: I950c41ca6b3fa0b0b1d65bddd3bd2a18c586d1e9