Merge android12-5.4 into android12-5.4-lts

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

It contains the following commits:

* d1c28b38 Merge tag 'android12-5.4.299_r00' into android12-5.4
* fa74ea17 UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY

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