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

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17260254

Change-Id: I28837d67c9965efde3d2885dd8552c637dd1014d