Merge "Fix test_hotspot_upstream_cellular failure" into main am: 0781c74af4 am: 4eb3a09d7f

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

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