Merge "Revert "Move tests to presubmit"" into main am: 3d2e3a3ead

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

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