Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: 06eb7abb93

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2498095

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