[automerger skipped] Merge changes from topic "latencytracker-vi-fix" into tm-qpr-dev am: 2076ef71 am: f5428fad -s ours am: c460691b -s ours am: aec68f7c -s ours

am skip reason: Merged-In Ib1c9464217e8a66fbd96d2192b13cf13713362e9 with SHA-1 0f8bbf88 is already in history

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



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