[automerger skipped] Merge ab/6749736 in stage. am: 08103b7215 -s ours am: fd66cc357c -s ours am: 30c05147c6 -s ours am: f61a85aeaf -s ours

am skip reason: Change-Id I29bbdc47a1e66d8703263794bc1940d7d5dd8e2e with SHA-1 b28d877934 is in history

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

Change-Id: Ia084429960315cc1e56b6533f8bcea298bc115db