[automerger skipped] Merge "Add DPM.hasKeyPair()" am: 46915d9a am:...

[automerger skipped] Merge "Add DPM.hasKeyPair()" am: 46915d9a am: 5c04261d am: a73c1787 -s ours

am skip reason: Change-Id I15ca6190db1ef4dbf0caabe9d46008d92f758df5 with SHA-1 b73e1524 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If68b9e0e52e4bb99e969da9e000d8aad67efcb3b