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

Sync up with android11-5.4 for the following commits:

b7be9b8b ANDROID: GKI: Update android/abi_gki_aarch64_sonywalkman

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