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

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



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