[automerger skipped] Backport test coverage from aosp/1547496. am: 1255ddbc...

[automerger skipped] Backport test coverage from aosp/1547496. am: 1255ddbc am: 134a538d -s ours am: 0c1166b2 -s ours am: 76d798c1 -s ours

am skip reason: Merged-In Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272 with SHA-1 a1c896e2 is already in history

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

Change-Id: Idb8793bdbd4ffaa92ec1eca3f5e9f5cd91f8ca25