Merge "[RTT] Fix deprecated Wi-Fi RTT availability APIs"