[automerger skipped] Merge "Update to use new ConnectivityManager API." am: 161f5ec3e9
am: 525b0dbc17
am:a9ed0226f5
-s ours am skip reason: change_id I614c20b9a1c6748614163766866bb59b15d794f1 with SHA1ab871a00c7
is in history Change-Id: I820acb6e661e0cc834b7a6ba42936e1c0e41a009
This commit is contained in: