Merge "Add some logging to aid debugging device state transitions." into...

Merge "Add some logging to aid debugging device state transitions." into sc-v2-dev am: d1436f18 am: c2544619

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

Change-Id: I8ccfa36a38e8ab1e25133c7e012fdf8b9fe417d4