[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -s ours am: 2a11302d90 -s ours am: e8e4dae9f9 -s ours am: 46ff9f686d -s ours

am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history

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

Change-Id: Iff431cd22236df44551dfde07be3eaf6e8b0c2ee