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
tree: 3df41f4205731501beaf7bf97820c79c46b4c2d1
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS