[automerger skipped] Merge "Added ownership attribution for test targets" into...

[automerger skipped] Merge "Added ownership attribution for test targets" into main am: 778ad88d am: 898bdc93 -s ours

am skip reason: Merged-In I6ca6e48ea1ec704216833c2c04177b0022e7b659 with SHA-1 8a32d828 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3282584



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