Merge "Update arm64 GKI 5.4 kernel test module" am: 95de06df17 am: 599cc97fbe

Original change: https://android-review.googlesource.com/c/platform/development/+/1883435

Change-Id: I53817ab1402141811487be3c0d0ecdbad5430410