Merge "Revert "Add more logging for wakelock stats inquiries"" am: 4f1774283c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b5e05921705fbb9db802dc1ddf007face99dfe2