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

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

Change-Id: I982301cdaf36457d1adecbcda1ffa6457fd3bfab