[automerger skipped] Backport test coverage from aosp/1547496. am: ee5ed04cbf am: ee04333c71 -s ours

am skip reason: skip tag Change-Id Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272 with SHA-1 c284b4b8dd is already in history

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

Change-Id: Id9d9f9db4bbed35bea8599a33a94c4248463364c
tree: a5eb007f22875a587b8ffd1f8b9b7ac3a5f04725
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS