Merge "Set ServiceConnectivityResources as target_sdk 33" into tm-dev