Merge "Add TestApi to block the RollbackManagerHandlerThread."