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

Sync up with android11-5.4 for the following commits:

103b3ee4 ANDROID: GKI: upate .xml file for new symbol addtions
0fbdadf4 Merge tag 'android11-5.4.134_r00' into `android11-5.4`
a4ef36f2 ANDROID: xt_quota2: set usersize in xt_match registration object
9b34778e ANDROID: xt_quota2: clear quota2_log message before sending
e7e0887e ANDROID: xt_quota2: remove trailing junk which might have a digit in it

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