Merge "RMS: Pass in rollback_id in the calls to installd"