Merge "Protect ConnectivityService from SecurityException in permission check." am: 4637a72f05 am: be9624a8e6 am: 2abd879236 am: 40ad49e8e6

Change-Id: Ib0d526dfcaca9805cdd12f775dc9571621f9dfaa