[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 am: 25615d7375 -s ours am: f59e507a6a -s ours am: 04debdfefa -s ours

am skip reason: Merged-In I9f7db4509bf8fe736f5d9fc08b164a20b2274aa8 with SHA-1 007171237e is already in history

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

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