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

Sync up with android11-5.4 for the following commits:

3dbc1d36 UPSTREAM: ovl: simplify file splice
5b845491 Merge tag 'android11-5.4.147_r00' android11-5.4
0dedfe3f ANDROID: ABI: update allowed list for galaxy
008930a8 ANDROID: ABI: Update allowed list for QCOM

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