[automerger skipped] Merge "wifi: Deprecate older versions of wifi HAL" am: 3d2cde64ee am: 60ce011e2f am: dfa6d1aca7 am: 364d13c85b -s ours

am skip reason: Change-Id I20f5b3665650c86fc0f976c544194f87157e6b90 with SHA-1 854acd7c7d is in history

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

Change-Id: Ibdb4001657b50e638134f406e52526cfe5e700b3