Merge changes I8194476e,I9d21909f

* changes:
  [Wi-Fi] Fix some test failures of com.android.settings.wifi.details2
  [Wi-Fi] Remove passpoint methods in WifiEntryShell