Merge "Allow RollbackManager to downgrade apks on user builds"