[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: 611cf21fd2 am: d116ced363 -s ours

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

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

Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a
tree: 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d
  1. framework/
  2. service/
  3. test/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING