Merge "Add min_sdk_version to connectivity targets"