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

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

Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b
tree: 3f46cbddde5561b9e139d3f6b9b6caf42677acd1
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING