Merge "Revert "Remove android.security.remoteprovisioning interfaces""