[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 am: 89b5529da3 -s ours

am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3c6 is already in history

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

Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a