Merge "Revert "Adds screen on/off event counter"" am: b917bab4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2565992



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