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: a264152d am: e07a5097 am: b8e786dd

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



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