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: 9f53fdb6

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



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