Merge "Custom network selection" am: bc3638ce5d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: Idd12259974b19a20a6969a0afce14c4825492138