Merge "[RTT] Update Wi-Fi RTT service name"
am: fbb05ff0b4

Change-Id: Iac6829e185218cb03dd5d430c25b43b61fc0ab13