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: I23b1a6af1cae98dc43d5644608bf769ec13bd5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>