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

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

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

Change-Id: Ib03e45e36f9145f9e9acb7959a00fc72661762c5