Merge "Don't call ConnectivityService when holding ActivityManagerService lock."
am: 31c89ed72e

Change-Id: I6f371c32085d7e76cac1891b7ff5dbf3a5e8d415