Merge "fix flaky behavior in FakeLatencyTracker" into udc-dev am: 819b087a am: 54e02794

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



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