[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 20bea1511f am: 32ae7b0365 -s ours am: a5404a7303 -s ours am: 55294a3c13 -s ours am: 60aea0a1ff -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7583891397987252bb6d203a92f623cdd6662816