Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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