[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 23706d874b am: 6450a46b4d -s ours am: d74ed4d49e -s ours am: 8abca045ca -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: If983d76caf3583866552b5e7a63c03431f67eb42