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

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

Change-Id: Ibc5b59bf907eeaacc30c6a5af71ee27120d37653