Merge "Merge "Logging to aid bug investigation." into rvc-dev am: bb9ea4e1 am: 5bb776d8" into rvc-d1-dev-plus-aosp am: 93a71d19

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

Change-Id: I77adc94bb77845bb67e7557fbc310bf039d998a6