[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am: 4517eacd5d am: 356edc5fe4  -s ours
am: 9a66c53711  -s ours

Change-Id: Iaa4b1f2ce6bdc1139fae501ec60c282ca4609396