Merge "Run OemNetworkPreferencesTest with DevSdkIgnoreRunner" am: 8384c693d1

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

Change-Id: I48f1f591f9da798f5c154314c6cf00d504e9f435
tree: 300af941b227d9307499ae8e68aed92fc4c0b612
  1. core/
  2. services/
  3. tests/