Merge "Trace Doze states." into tm-qpr-dev am: c7cbe169 am: 73b0c6a8

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



Change-Id: Id0fe5f4c9669a6685fd4ead43872c6f1b26e8018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>