Merge changes from topic "presubmit-am-e833326127be4c3ab596bac5f928e526" into sc-v2-dev-plus-aosp am: f9f19e7d26

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

Change-Id: I424473f3ab3cebb45c0c4902a8e86e63241b661e