tree e333f1ec1bb99b5a71657c1e3a5f052197d60363
parent 3cfe5b265c62c42fcf6062f5573e9519d4e1a607
parent f2c45c31d349314cc9c5071466b473ca93a415a2
author Remi NGUYEN VAN <reminv@google.com> 1615200125 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615200125 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60a24c0fc878737e120414fe85786faacb425b09