[automerger skipped] Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 am: 28a89348a9 -s ours

am skip reason: skip tag Change-Id I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 3aa6043c46 is already in history

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

Change-Id: I886ca8978862d2dacc11d2bd5d4977698e953935
tree: 3c373d6422ce92df77c2ee08e49341531636320f
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS