[automerger skipped] Merge "Add DPM.getKeyPairGrants()" am: 944e30cf am:...

[automerger skipped] Merge "Add DPM.getKeyPairGrants()" am: 944e30cf am: aa0847ed am: 592a8582 -s ours am: 7bc32e7d -s ours am: 9097ec04 -s ours

am skip reason: Merged-In Ieee1048b145fb8400eccbf32c054afc64b5d90c0 with SHA-1 148e31d7 is already in history

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

Change-Id: Ibdd7f84cfe2be64f2d5eae1e3a8bfbbda34e8033