Merge "Merge "Adding proc state to wakelock logging" into udc-dev am: a61baacd am: 1ea3cbf3" into udc-d1-dev-plus-aosp am: 1c79a07e am: f760667b

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



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