Merge "Update automotive generated AIDL files"