Merge changes from topic "presubmit-am-e3e2add64b024513abc5e9b1a9962344" into sc-v2-dev-plus-aosp am: 8eb1640abd am: 3bafa0a3ab am: eb15e03bb9

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

Change-Id: I047ef37031582a1e0dde789dbd74177e92a1ebae