Merge "Allows DPM.generateKeyPair() to be called from PO of affiliated user." into sc-v2-dev am: 4459afb810 am: eee9fa67cf

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

Change-Id: Ia78b84068b51ed430ab4663d08433dcb5cbdb86d