[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d816527c32 -s ours am: e21bb478ba -s ours

am skip reason: Change-Id I17602e470cf1600f0321a715dceff543c220b5f0 with SHA-1 ecda196797 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17d1e4e64e11374002fad5dacee56d633fbc2dbf