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

Sync up with android11-5.4 for the following commits:

8eb84122 ANDROID: ABI: update allowed list for galaxy

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