resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 am: ffe59902cf am: 17b4746d43 am: bdb1501d47

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

Change-Id: Ia838a74d4d1823aeb10ac77570aed15d23578e80