Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1fa

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

Change-Id: Iac93d71dce312d955d76ca7b6b011720ccb5e7f0