[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -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: I407ee9fd5e2624a86175d88d92427689fc4302b4