[automerger skipped] Merge Android R am: ed44f0cbef -s ours

am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history

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

Change-Id: I18c998cf63cfd1ada1051f881a71e3d9e0aac1f0