More robust tests. am: 2a6cec9647 am: 5162f69948

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

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