[automerger skipped] Merge Android R am: 15f18c5c51 -s ours am: 23168f624c -s ours am: f231ab3f2d -s ours

am skip reason: Change-Id Id0eeb4e6ccb6c6bd9c5e02e1190fe05f2e2710c3 with SHA-1 327459170c is in history

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

Change-Id: Ibe148a7bbac39a64940010084888d7cfd14472df