Merge "Fix trace counter for display refresh rate" into udc-dev am: fc41c391...

Merge "Fix trace counter for display refresh rate" into udc-dev am: fc41c391 am: e2b6a0fe am: 8ee07b6b am: 4696b4c5

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



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