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

Sync up with android11-5.4 for the following commits:

16d99ebe ANDROID: ABI: Update allowed list for QCOM
f4f92f00 ANDROID: ABI: Update allowed list for QCOM

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