Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev