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

Merge "Merge "Add log for debugging flaky test" am: 5a9aacd1 am: 452bdba4 am: 389f04df am: 55543118" into tm-qpr-dev-plus-aosp am: 867fc581

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



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