[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 1ea7fce31a am: 23b5d1146f -s ours am: fae0b4a647 -s ours am: fd38791411 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I48860edda3e0fa77b8b7c50858315fad94294446