Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline...

Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd80 am: 0dda8157" into tm-qpr-dev-plus-aosp am: 3966b142

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



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