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