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

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

Change-Id: I12fab3c3b48718022278c630dec02adee454eebe