[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours

am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history

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

Change-Id: Id47c50ff17a70ae23818554d448b1cd7223ed080