[automerger skipped] Merge "Show a warning about mismatching test / APK certs" into sc-v2-dev am: 34c8baf0 am: b6b90214 -s ours am: 196ca141 -s ours am: 7b7f9715 -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: Ia27661fd0277cc766e12bf4c1057b1856831e1c7