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

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

Change-Id: I22e26261dcc59274c4286271409ee63c1760b074