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
tree: 1b5fe2b0a812b51ec7c5e31acf49daa1ec963c58
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING