Merge "Migrate Test Targets to New Android Ownership Model" into main am: 548a052df3 am: f6b77df447

Original change: https://android-review.googlesource.com/c/platform/system/tools/sysprop/+/2946398

Change-Id: I776c9376fda3e9a95299a14bf18aff90a7209bee
Signed-off-by: Automerger Merge Worker <[email protected]>