[automerger skipped] Merge "Add logs for debugging flaky test" into rvc-dev...
[automerger skipped] Merge "Add logs for debugging flaky test" into rvc-dev am: 33285aff am: 8b8b7292 -s ours
am skip reason: Change-Id I84234ba7cebe793c3bb1d0aab2739b22f5c7d11c with SHA-1 6cadb9bb is in history
Change-Id: I75ef26a4ac609e9ba1698ec99cba438ac3e7093a