[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: be3cec1a7a -s ours am: 0f4da2db17 -s ours

am skip reason: Change-Id I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 with SHA-1 40300a49c7 is in history

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

Change-Id: I22bffac666abdc35261b06bc69dcf9b3c08f651f