Merge "Expose some level of logging to aid debugging. am: bc86158b am:...

Merge "Expose some level of logging to aid debugging. am: bc86158b am: 66fbe163 am: dfb995d6" into rvc-qpr-dev-plus-aosp am: 70191c3a

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

Change-Id: I3c39be84aab6f73645e451d393178bf733634c3c