Merge "Removing SystemApi added in aosp/2685327" into main am: e423ae1076 am: 378d54c4d5 am: 73376b1c63

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733765

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