Merge "Remove the hidden API access from common shim" am: ef651e3be9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2057203 Change-Id: Ieb29f3adf747f54868def3278c362bd53a6693f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>