Merge changes from topic "presubmit-am-2e4ef926b35e4607ac1a3ef7ba5fa601" into sc-qpr1-dev am: 0e2eff0028

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

Change-Id: I73dcced4c257b5f95ae5877fcd85c5cdc979a998