Merge "Give the PO the MANAGE_DEVICE_POLICY_CERTIFICATES permission" into...

Merge "Give the PO the MANAGE_DEVICE_POLICY_CERTIFICATES permission" into udc-dev am: e8899cf6 am: 5263ffa5 am: fe52e68b

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



Change-Id: I57909cd7e9229b3053bbb6b861e8d21bb148ae4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>