[automerger skipped] Backport test coverage from aosp/1547496. am: 1255ddbc76 am: 134a538d0b -s ours

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

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

Change-Id: Id9d9f9db4bbed35bea8599a33a94c4248463364c