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

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

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