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

Sync up with android11-5.4 for the following commit:

35042a2a ANDROID: ABI: Update allowed list for QCOM
bf9fcff8 ANDROID: x86: configs: gki: add missing CONFIG_BLK_CGROUP
9c7d617b ANDROID: ABI: Update allowed list for QCOM

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