Merge changes from topic "latencytracker-vi-fix" into tm-qpr-dev am: 2076ef71

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



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