ANDROID: GKI: fix up android/abi_gki_aarch64.xml merge

I messed up when doing the merge of `android11-5.4` into `android11-5.4`
and I took the .xml file from `android11-5.4`, not the other way around.

Either way would have required a .xml update, but this way required 2
updates, not just one :(

Anyway, this restores the ABI .xml file back to the original values
for this branch, in addition to the additional symbols that were pulled
in from `android11-5.4`

The summary of the abi changes are below, they have all happened in much
older LTS releases, and were accepted then.  They cause no real ABI
problems.

Leaf changes summary: 3 artifacts changed
Changed leaf types summary: 3 leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

'struct inet_connection_sock at inet_connection_sock.h:87:1' changed:
  type size hasn't changed
  1 data member insertion:
    'u32 icsk_probes_tstamp', at offset 11008 (in bits) at inet_connection_sock.h:151:1
  there are data member changes:
    type 'struct {int enabled; int search_high; int search_low; int probe_size; u32 probe_timestamp;}' of 'inet_connection_sock::icsk_mtup' changed:
      type size changed from 160 to 128 (in bits)
      there are data member changes:
        2 ('int search_high' .. 'int search_low') offsets changed (by -32 bits)
        'int probe_size' offset changed (by -95 bits)
        'u32 probe_timestamp' offset changed (by -32 bits)
  2 impacted interfaces

'struct tcp_sock at tcp.h:138:1' changed (indirectly):
  type size hasn't changed
  there are data member changes:
    type 'struct inet_connection_sock' of 'tcp_sock::inet_conn' changed, as reported earlier
  one impacted interface

'struct usbnet at usbnet.h:29:1' changed:
  type size hasn't changed
  there are data member changes:
    data member u64 android_kabi_reserved1 at offset 4992 (in bits) became anonymous data member 'union {struct {u32 rx_speed; u32 tx_speed;}; struct {u64 android_kabi_reserved1;} __UNIQUE_ID_android_kabi_hide213; union {};}'
  16 impacted interfaces

Fixes: 1d03502d ("Merge branch 'android11-5.4' into 'android11-5.4-lts'")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I295a286382de6e354f89aa02cbf6bd32f917eac7