Merge "[AWARE] Add ranging API to discovery configuration"