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:

* b666a118 Merge tag 'android12-5.4.300_r00' into android12-5.4
* cdcb3f81 UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize

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