[automerger skipped] Merge "Don't call ConnectivityService when holding...
[automerger skipped] Merge "Don't call ConnectivityService when holding ActivityManagerService lock." am: 31c89ed7
am: 5b7bf299 -s ours
am skip reason: change_id Ia2b2c6de8a01a264bfb09393144641d91ee2c164 with SHA1 34a27c4c is in history
Change-Id: I8920ed9d2fcb86d618121cab7ed25279b2657565