Merge "Migrate Test Targets to New Android Ownership Model" into main am: c2afb0c8fe am: 91707c21ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3026424

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