Merge "wifi: put vintf fragment into wifi apex" am: 9113258f am: 58ccf347

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



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