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

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/2946506

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