[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am:...

[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b60 am: d4619298 am: 89b5529d -s ours am: eb84dcea -s ours

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

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

Change-Id: I789343ef7fbc27010d013df9f7323ec2dbc5a99f