Merge "Move large test modules into separate files" into main am: f33103c5d3 am: 316cdd6037

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3164656

Change-Id: I9566ec21a80be13830e809984dc2bacfccbbf678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>