Merge "Changing the targetSdkVersion for RESTRICT_LOCAL_NETWORK" into main