[automerger skipped] Merge Android 12 am: 65b5bb19d4 -s ours am: 9ac3ed118f -s ours am: 0d30b1bd18 -s ours am: ae6807df7f -s ours am: 40eb63e814 -s ours

am skip reason: Merged-In If40b13f6263a3c0123916bb95a987505e78767a2 with SHA-1 00e4df3ea4 is already in history

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

Change-Id: I50caf9bba032aa09b74fe1f0637101676b549e71