Merge "Adding @IgnoreUpTo to OemNetworkPreferencesTest" am: 4450ca52cb am: 43c0e2a139 am: 5071265e74

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

Change-Id: Ib3782ba72d93d0fe647a6433dda4cdc51a645fb0