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

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

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