Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832

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

Change-Id: I486b0d2759200a5a1bb9679577f5d97ea43c252b