Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426 am: 37aa459906

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f0c36460103552d1c1f21a8a5f8486274d282e2
tree: 81c0f544d5fb6f458cf18773ffda99b47d37419f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS