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

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

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