[automerger skipped] Merge "Merge redfin/bramble support." am: 01e833073e -s ours am: 75338fd4ab -s ours am: 6f57774d22 -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: Icaa64e02aa1daad17f419196c5052184c00e9486