Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 7878b21c6f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I899dc428c0bb67b5fc64ae64f4f79f1eed0b4f47