Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1 am: 26f1e233

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

Change-Id: I53dd58a1d7cbac01706ac6332352db7de4ecddbe