[automerger skipped] Merge "Merge redfin/bramble support." am: 01e83307 -s...

[automerger skipped] Merge "Merge redfin/bramble support." am: 01e83307 -s ours am: 75338fd4 -s ours

am skip reason: Change-Id I93903c258f834a9e9537b88882d77a6660482638 with SHA-1 2ef7e399 is in history

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

Change-Id: Id0a423d4ba56a56c311d17aaf3c130ef09a4e9fd