Merge "DO NOT MERGE - Merge ab/7272582" am: 4b337efba5

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

Change-Id: I37fd2e6d6573b75f429073796b5b3ff8951c9546