Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65e

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

Change-Id: Icdf319d564e4eab468d9d4e722716a2ef7d2c3cd