Merge "Don't call ConnectivityService when holding ActivityManagerService lock." into qt-dev
am: 6c4094c67d

Change-Id: Ibdaf0c403c790ba0020a83d7ed2be978d09c813e