[automerger skipped] Merge "UpdateAvailableNetworks apis" am: c3d4693f79 am: ee244266ce
am: 8e9bf61074  -s ours

Change-Id: Ie85277479dc7ef1d398072885289a541128bd426