Merge "Remove system_server_current related work arounds" am: b789d6a6da

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

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