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

Sync up with the android11-5.4 branch to take some additional changes
and some new abi symbols to properly track here.

This includes the following changes:

* d57e792d UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* 118240f1 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 28e9ee34 ANDROID: ABI: Update allowed list for QCOM
* d62f1fc1 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 657abd3d UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* 212a7aad UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* ac9e6cd1 UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* e4b912f6 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* f38754f7 UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 07452ef6 UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()

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