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

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

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