[automerger skipped] Merge "Always set NetworkInfo objects to available." am: ac916d6e2b am: 4be9a47a39 -s ours am: ee3c2b3686 -s ours
am skip reason: Change-Id Ia9876b0ce7f02120bd05cab526346cad22cf62b3 with SHA-1 0a39e0e71a is in history
Change-Id: I177cf01e7e702a48fea82f5bbf5710f544f93711
This commit is contained in: