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

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



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