Merge android11-5.4 into android11-5.4-lts

This merges the android11-5.4 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* c92395c2 Merge tag 'android11-5.4.299_r00' into android11-5.4
* 189b48eb UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* dd8b17ef UPSTREAM: perf/core: Fix potential NULL deref
* b7a9bb08 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()

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