[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 2963f9eaa0 -s ours

am skip reason: Change-Id I6c07936d7cae7dd03fa80b4cf533f54928ee6fa1 with SHA-1 c09a9b4d0a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libexif/+/12984485

Change-Id: I5601291a449bd0fe22723a84c82cda8aead0d8dd