Merge "Adding proc state to wakelock logging" into udc-dev am: a61baacd am: 05ecc204 am: d1b99a6b am: c8df7651

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



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