[automerger skipped] Merge "Protect ConnectivityService from SecurityException...
[automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 543fcd8b -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 292963de is in history
Change-Id: If88006f48fc2f25ca989d830a37d651a75f68448