More robust tests. am: 2a6cec96

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



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