Merge "Remove the hidden API access from common shim" am: ef651e3be9 am: d125357c2b am: ad7807e2f2 am: 75c84e1dd7 am: bad7046b94

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

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