Merge "Migrate Test Targets to New Android Ownership Model" into main am: 4b7684a7b3 am: 44c2a1fa49

Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2945330

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