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

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

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