Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 23706d874b

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

Change-Id: I69defeabb59cc3d8c7c0ca3862250b1e77157109