Merge "Change SharedConnectivityService's permission check to use checkCallingOrSelfPermission" into udc-dev