Merge "New log buffer for debugging WakeLocks" into udc-dev am: e7ff0951 am: dd231177

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



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