[automerger skipped] Merge "Always set NetworkInfo objects to available." am: e8a5275bc9 am: 9b08eb340a -s ours
am skip reason: Change-Id Ia9876b0ce7f02120bd05cab526346cad22cf62b3 with SHA-1 109d5dc28b is in history
Change-Id: I1dc94a163f65c12fefa26c36f567c28de1f5408d
This commit is contained in: