Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3

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

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