[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 7878b21c6f am: 447198c057 -s ours am: a9beff9a2d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b22972987383098035913e265d1ff1562220ed