[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 244aa41f60 -s ours

am skip reason: Change-Id Iaa234f89b2bb04ef44e5dfc9b0699a1106e95514 with SHA-1 ae21beb324 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I339cc3dfb18a6111c34a44250b19ad645aa05a9a