Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: 06eb7abb93 am: f0c397dce8 am: 1b099c13ad am: e1328ae009

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

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