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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib81f8e12efdbb2c23d87d6a1ade4e451d8f4df6d