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

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

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