Cherry-pick some test changes from ag/13210542. am: e7963a1d82

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

Change-Id: Iebfee24a963aac516bf44ef70128ffdaeec25a45