[automerger skipped] Merge "wifi: put vintf fragment into wifi apex" am: 9113258fe0 am: 58ccf347e4 am: 0dfa99ed9f -s ours

am skip reason: Merged-In Id8f196386967c3023cb5ee308d31b8cdeed7df0b with SHA-1 bab159cc73 is already in history

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

Change-Id: I9b71d83e5cd111cd2ad8901c95a6b6ebac43ac52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>