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

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

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