Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//packages/apps/WallpaperPicker2 into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I6a0260d4c9fbe99337fba4b37006007db0dfdcd2