Merge "Info the am instrumentation if test process attach failed." into tm-dev...

Merge "Info the am instrumentation if test process attach failed." into tm-dev am: 91fa7a8d am: 6d10a577

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18111564



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