Merge "Update AIDL files accidentally diverged from HIDL / libcamera_metadata." into tm-dev