Merge "Adding @IgnoreUpTo to OemNetworkPreferencesTest" am: 4450ca52cb

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

Change-Id: Ie7cf35131d553279ccd3244536107c2a0c53b379