Merge "Migrate Test Targets to New Android Ownership Model" into main am: e7a2ed0bc6 am: 50e4f925db

Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/2945331

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