Merge "Add log for debugging flaky test" am: 5a9aacd125

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

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