[automerger skipped] Merge "Mark FakeLatencyTracker as flaky" into...

[automerger skipped] Merge "Mark FakeLatencyTracker as flaky" into udc-dev-plus-aosp am: dad9ce7c -s ours am: e76e7973 -s ours am: 2d8d07a2 -s ours

am skip reason: Merged-In I603ebe0ceac23335248a8cdb299d52829b55536a with SHA-1 1d507e38 is already in history

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



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