[automerger skipped] [automerge] Show a warning about mismatching test / APK certs 2p: 983caedd am: 81a4e811 -s ours am: a1d2722f -s ours

am skip reason: Merged-In Iebbe1c8749ef43ac310179698a048a93be47e24b with SHA-1 cb5d61b4 is already in history

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

Change-Id: I004dc4f1f2cf03c6f490e7cdb24e6121ab623638