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

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

Change-Id: Iaefa6faafd8ace9ea3b95a7e97217958a5a15add