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

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



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