[automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history
Change-Id: Ic965376fbf895252141d4d3ed9c3898d6e1bd8a9
This commit is contained in: