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

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



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