Merge "Update sdk_version to current" am: 0ff0ca4776 am: f64d6180aa

Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/1778286

Change-Id: I69f3c7cafb2977c27e365ab5576721610962a9bb