[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: cf3b50fa -s ours am: 2d580050 -s ours am: 13b654e9 -s ours

am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 a5333b95 is in history

Change-Id: Iad090df35de2523880f2b5c63be591861555d727