DO NOT MERGE - Merge ab/7272582 am: 30249cb155

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

Change-Id: I379b5f0a068effa4726e372482fde29a0326b773