Merge "Move #nativeWaitForService into CommonConnectivityJni" into main