Merge "Removing unused counters." into main am: 6106318ca7 am: 8c6989b74f am: dedf52bcff

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

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