Merge "Merge "Fix flaky tests" into udc-qpr-dev am: a810888e" into...

Merge "Merge "Fix flaky tests" into udc-qpr-dev am: a810888e" into udc-qpr-dev-plus-aosp am: 7a8bfb2e

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



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