[automerger skipped] Merge redfin/bramble support. am: 20868ae812 -s ours am: 104f4f7ce8 -s ours

am skip reason: Change-Id I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 with SHA-1 08103b7215 is in history

Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1465930

Change-Id: I5d80a5a986e2714846f8ba527d9697aee04b6638