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