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

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



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