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:

* f332d6bb Merge tag 'android11-5.4.300_r00' into android11-5.4
* 59683ca0 UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize

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