Merge "wifi: extending framework restart waiting time" into sc-v2-dev am: c69d81e5f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16063834

Change-Id: Iaa650b3b3edf214f556fbfd4dbed0cf27bf60ae9