[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9e38564f2b am: 6014b0b027 -s ours am: d203ef1ccf -s ours am: ae70011679 -s ours

am skip reason: Change-Id I4de70efc16082e16f7d336d5612357560ab2cc2c with SHA-1 cb99ab0cd2 is in history

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

Change-Id: Ieca03abb175ae70ce0fc7bcc204a6cdfb377cf90