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

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



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