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

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

Change-Id: I6d89952b92960388319c516858ffbc08fd69b058