[automerger skipped] Merge "Remove unsupported NetworkManagement AIDL methods"...

[automerger skipped] Merge "Remove unsupported NetworkManagement AIDL methods" into main am: 4af925ff am: b5bb9046 -s ours

am skip reason: Merged-In I05514790e05e779777ed6f7b1b2f87479012b202 with SHA-1 4cbacfd0 is already in history

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



Change-Id: I91cb3e0e2cdb849a1fdd5dd52265cdc619406f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>