Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev

* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I