Merge "Add NEARBY_SERVICE constant shim"