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

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

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