Merge mainline-release 6664920 to master - DO NOT MERGE am: 62309e5cbd

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

Change-Id: I570de10913dd693d1ee5c0780b7c77ce5ef015d2