Merge "Adding @IgnoreUpTo to OemNetworkPreferencesTest" am: 9a9e45ad72

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

Change-Id: Ie7cf35131d553279ccd3244536107c2a0c53b379
tree: 9c7cb40c131c56575040e2689b7a75b7687f9d83
  1. core/
  2. services/
  3. tests/