Merge "Change Connectivity resources SDK version to 30"