[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am: c83d2abdf2 -s ours am: ae02f3cbc2 -s ours

am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069

Change-Id: I20dae1d794adfbb7c5c097271c42d9c135dace9c