Merge changes I5b58a75f,I07d9c70a into android12-tests-dev

* changes:
  wifi: extending framework restart waiting time
  wifi: remove disable_framework option to pass the stopWifiFramework procedure