Backport test coverage from aosp/1547496. am: ee5ed04cbf

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

Change-Id: I559be41c77cc6348e745324ab675c603b1f3ad1d
tree: a4d3769a8a531ef6b7f7c647a973da5e707294d5
  1. core/
  2. services/
  3. tests/