[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 06c1d1c8c8 -s ours am: 45eac04dcb -s ours

am skip reason: Change-Id Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97 with SHA-1 dce679f709 is in history

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

Change-Id: I637a15579ef43ea4d29f32dc0cfa4475d61e6214