Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 543fcd8b29

Change-Id: I5b44ff9afedcf40d82ba0c4666b2b16e72583383