Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c am: aa0847edb5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ad6809ee6231592488e160fcfef571e452b5304