Merge "Revert^2 "Adds screen on/off event counter"" am: 8e9591db am: ef7d3d10 am: b9d02720

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



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