Merge "Add @hide to AIDL interfaces" into main