Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f9d4a93709ffe0013e0fadd27d991a75c77605