Merge "Migrate Test Targets to New Android Ownership Model" into main am: cbae97c988

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

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