Merge "[ServiceConnectivityResources] Remove explicit targetSdkVersion"