Merge "Add log for debugging flaky test" am: 5a9aacd1 am: 452bdba4 am:...

Merge "Add log for debugging flaky test" am: 5a9aacd1 am: 452bdba4 am: 389f04df am: 55543118

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



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