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

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2946232

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