Merge "[RTT] Update Wi-Fi RTT service name"