Merge "Update arm64 GKI 5.4 kernel test module"