Merge changes from topic "presubmit-am-fb33f7a4e83c4d91b42384f00687de4a" into sc-qpr1-dev am: 060da02c46

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15916112

Change-Id: Ifff784597336d34205900c979d648eca7b9e6959