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

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

Change-Id: I3583a9e7af5ffdc59ee1261f18944a52c82ab6ca