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

Catch up on changes made in the non-lts branch.  Commits in here
include:

* 61766d2f Merge tag 'android11-5.4.290_r00' into android11-5.4
* 0d3e5b23 ANDROID: ABI: Cuttlefish Symbol update
* c1ccccc7 ANDROID: gki - change networking configuration
* 26399219 ANDROID: kernelci build-break for 64-bit riscv clang builds (5.4 only)
* 2c404122 Revert "BACKPORT: RISC-V: Stop relying on GCC's register allocator's hueristics"
* c065d061 Revert "ANDROID: declare sp_in_global outside of CONFIG_FRAME_POINTER"

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