Merge "Fix metrics test flakiness" into tm-dev am: d718e76f47 am: d5318be209

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

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