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

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

Change-Id: Id58fe8cd445f3b10bfa7eac314cd5239f27983b0