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

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

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