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

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

Change-Id: Ib3782ba72d93d0fe647a6433dda4cdc51a645fb0
tree: 81fcd5f841422f63a50d3a79830b2a7b143e3ce3
  1. core/
  2. services/
  3. tests/