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

Sync up with android11-5.4 for the following commits:

0a5d2ddf ANDROID: GKI: update symbol list for xiaomi
6b6b8dc6 ANDROID: GKI: Update abi_gki_aarch64_oplus

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