[automerger skipped] [nearby] Fix test failure am: e450df6981 am: 8d7f296813 am: f6111e2312 -s ours

am skip reason: Merged-In I7048917f5345f55364626901b533fee3d3856bf7 with SHA-1 f6fdf4cf7b is already in history

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

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