[automerger skipped] Merge redfin/bramble support. am: 9dfed13827 -s ours

am skip reason: Change-Id Id4f5f987398148e223bc20289e8adfbd5054b409 with SHA-1 ab61422b4e is in history

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

Change-Id: Ie107d5dc884fdfa353ef0aeb5d0e0a0b7d214b6f