[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 23706d874b am: 6450a46b4d -s ours

am skip reason: Change-Id Id4940d3a2330561076f9bfc43fec310efec90d77 with SHA-1 a4add29008 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/wallpapers/LivePicker/+/1429926

Change-Id: Ia0e5e1be843166c281bcc13ff2a413cedd4a0cd6