Merge "Protect ConnectivityService from SecurityException in permission check." am: 4637a72f am: be9624a8 am: 2abd8792 Change-Id: I35c9c3c197f47be241a9a0839ee9bf8ac9b332df