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

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

Change-Id: If5b1fe6443be1459f6f46e58d3c614330b65ceb5