Merge "Fix pro-guard rules for service-nearby" into tm-dev am: 3c4a43dcdf am: 5b0ad60d60

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

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