Merge "Adding OEM Network Preferences for testing" am: 240eb9907b am: 67fc786ade am: 96900dc792

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

Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b