[automerger skipped] Merge "Update network selection API" am: 2577e1cf8e am: b7c2507ff4
am: ea098fac95  -s ours

Change-Id: Id7a19ecd63da4f966e2f15b70f16f31fcc7b6d77