Merge "Merge "Add log for debugging flaky test" am: 5a9aacd125 am: 452bdba48d am: 389f04dfb6 am: 555431189e" into tm-qpr-dev-plus-aosp am: 867fc58158

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>