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

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

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