Merge "Adding OEM Network Preferences for testing" am: 9e1bc22ce5 am: 0cc8a225ac

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

Change-Id: I982301cdaf36457d1adecbcda1ffa6457fd3bfab