Merge "Fix `symbol not found` error for hidden apis used by MTS" am: 8d4702a1f0 am: bfe0445299

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

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