Merge "[automerger skipped] Merge "Path correction of excluded tests in ActivityTests" into android12L-tests-dev am: 1d8cee501a -s ours" am: ef1420e490 am: d9edc62018 am: 35bb3dd8ab am: 519c9442bf am: bc64a21496

Original change: https://android-review.googlesource.com/c/platform/cts/+/2114934

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