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

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

Change-Id: Ieece489d63064e6646eb02dd7cc8598e4ed50002