Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

4271ad6e BACKPORT: mac80211_hwsim: add frame transmission support over virtio This allows communication with external entities.
8e3c3ebe ANDROID: ABI: add symbols of sprd_ion.ko and snd-soc-sprd-codec-sc2730.ko to unisoc

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6f756dd6d72ea7d585902bddb350202fc49c7a3c