Merge "Remove the hidden API access from common shim" am: ef651e3be9 am: d359a748dd

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

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