Merge "Add NEARBY_SERVICE constant shim" am: f354e20580 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2014858 Change-Id: I105f40c9988b7d387d7237ad2e0bed2f21789cee