Merge "Add test modules for arm64 GKI 5.10 Oct release" am: 28ac820d0e am: ae738006fb

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

Change-Id: I410f8302fa28dc27284a26a2c5ab2150209f42bf