Merge "Include non-local tests by path" am: 6e50b8e094 am: 16f9b85bed

Original change: https://android-review.googlesource.com/c/platform/development/+/2402710

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