Merge "Fixes flaky tests" into tm-dev am: 8fbc44fb am: 90402695

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



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