[automerger skipped] Merge "jpegrecoverymap: XMP fixes." into udc-dev am:...

[automerger skipped] Merge "jpegrecoverymap: XMP fixes." into udc-dev am: 1f428c8a am: 8f180ade -s ours

am skip reason: Merged-In Ia4073cd75646dd79aee391e8d44169b3527f6e93 with SHA-1 31f03e33 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22466253



Change-Id: I3e9ecd4b8fade55a008dd3d8bd6c1a764bf34767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>