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

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

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