Merge "Run OemNetworkPreferencesTest with DevSdkIgnoreRunner" am: a30437ce32 am: f0f8eba258 am: 481898927f

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

Change-Id: Id5562e4d66f50a0c2ee9d863982f38523c5602b7