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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2945335

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