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

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

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