Merge "Update network selection API"
am: 2577e1cf8e

Change-Id: I86a7cb276589a5ae595c014f48770289c18b656a