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

Change-Id: Ibdbd1d7b667506ac14b8cc487d17d11f82a993b0