[automerger skipped] Change Connectivity Manager to Network Manager am:...

[automerger skipped] Change Connectivity Manager to Network Manager am: 46601ac7 am: a28272b7 am: 5be5e174 -s ours

am skip reason: Change-Id Ieeaac0e5080ce2fe7b6e223d50847dee74f08569 with SHA-1 46601ac7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/10978694

Change-Id: I0fba4e1f4183b514c653ff9bbae54e5fd08066ad