[automerger skipped] Cherry-pick some test changes from ag/13210542. am: 250710c6 am: 127c8b83 am: b8a344c4 -s ours am: a6809963 -s ours am: 1166ae36 -s ours

am skip reason: Merged-In I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 21147c02 is already in history

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

Change-Id: I61b5ec82daa89e128b395649e2be1b1a05360393