Merge "Add min_sdk_version to 3 aidl interfaces" into main